Disable wasm

diff --git a/debian/changelog b/debian/changelog
index a166eac3ffc25975f56d149916e7c17a2b514cf8..0be639540592f874d5112d623a428e25997ee6de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,13 +40,14 @@ llvm-toolchain-18 (1:18.1.8-20+rpi1) forky-staging; urgency=medium
   [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
   * Disable scudo on armhf, it needs atomics which we do not want to enable.
 
-  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
-  * Remove armhf from architecture list for libunwind-13-dev dependency.
-
   [changes brought forward from 1:18.1.8-18+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Wed, 04 Jun 2025 04:23:54 +0000]
   * Remove armhf from libunwind dependency architecture list.
 
- -- Raspbian forward porter <root@raspbian.org>  Sat, 31 Jan 2026 12:06:40 +0000
+  [changes introduced in 1:18.1.8-20+rpi1 by Peter Michael Green]
+  * Disable wasm.
+  * Disable windows.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 12 Feb 2026 01:09:26 +0000
 
 llvm-toolchain-18 (1:18.1.8-20) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 2c69f61e44e6b607d35c12e5b2363fa75a70f418..7cdd114deb7d09649670015ff9685d6324f4369d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -209,7 +209,7 @@ Description: Compiler-rt - development package
    * profile - Library which is used to collect coverage information.
 
 Package: libclang-rt-18-dev-wasm32
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -217,7 +217,7 @@ Description: Compiler-rt - wasm32 builtins
  Provides the compiler-rt builtins for WebAssembly 32 bits
 
 Package: libclang-rt-18-dev-wasm64
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -714,7 +714,7 @@ Description: LLVM C++ Standard library (development files)
 
 Package: libc++-18-dev-wasm32
 Section: libdevel
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Depends: wasi-libc, libc++abi-18-dev-wasm32, ${misc:Depends}
 Provides: libc++-x.y-dev-wasm32
@@ -775,7 +775,7 @@ Description: LLVM low level support for a standard C++ library (development file
 
 Package: libc++abi-18-dev-wasm32
 Section: libdevel
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Depends: wasi-libc, ${misc:Depends}
 Provides: libc++abi-x.y-dev-wasm32
@@ -833,7 +833,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-18
 Section: libs
-Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 i386 loong64 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}

diff --git a/debian/control.in b/debian/control.in
index b0fec33037d9e67003d8eff7937cfa9103888f03..4be417205774910ef08638db3ff02753cccb267b 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -209,7 +209,7 @@ Description: Compiler-rt - development package
    * profile - Library which is used to collect coverage information.
 
 Package: libclang-rt-@LLVM_VERSION@-dev-wasm32
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -217,7 +217,7 @@ Description: Compiler-rt - wasm32 builtins
  Provides the compiler-rt builtins for WebAssembly 32 bits
 
 Package: libclang-rt-@LLVM_VERSION@-dev-wasm64
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -714,7 +714,7 @@ Description: LLVM C++ Standard library (development files)
 
 Package: libc++-@LLVM_VERSION@-dev-wasm32
 Section: libdevel
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Depends: wasi-libc, libc++abi-@LLVM_VERSION@-dev-wasm32, ${misc:Depends}
 Provides: libc++-x.y-dev-wasm32
@@ -775,7 +775,7 @@ Description: LLVM low level support for a standard C++ library (development file
 
 Package: libc++abi-@LLVM_VERSION@-dev-wasm32
 Section: libdevel
-Architecture: all
+Architecture: none
 Multi-Arch: foreign
 Depends: wasi-libc, ${misc:Depends}
 Provides: libc++abi-x.y-dev-wasm32

diff --git a/debian/rules b/debian/rules
index 3bcbd39874b03f3dfd456ddb090970571214ffa1..223271bba0b6abff54b5894d41be0f7be6d2575f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -496,7 +496,7 @@ ifeq (,$(filter-out $(LLDB_PYTHON_DISABLE_DISTRO), $(DISTRO)))
   LLDB_PYTHON_ENABLE=no
 endif
 
-LIBCXX_WASM_ENABLE=yes
+LIBCXX_WASM_ENABLE=no
 LIBCXX_WASM_DISABLE_DISTRO := bionic buster focal bullseye jammy
 # Either wasi-libc doesn't exist / too old
 # or we have this bug
@@ -1091,11 +1091,11 @@ endif
 
 # Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as
 # libcxx requires wasi-libc, which only exists for wasm32 right now.
-stamps/debian-wasm-build: \
-  build-wasm/compiler-rt-wasm32 \
-  build-wasm/libcxx-wasm32-wasi \
-  build-wasm/compiler-rt-wasm64
-       touch $@
+#stamps/debian-wasm-build: \
+#  build-wasm/compiler-rt-wasm32 \
+#  build-wasm/libcxx-wasm32-wasi \
+#  build-wasm/compiler-rt-wasm64
+#      touch $@
 
 stamps/sccache-stats:
 # If we used sccache, shows stats
@@ -1111,7 +1111,7 @@ override_dh_auto_build: \
   stamps/debian-full-build \
   stamps/debian-libfuzzer-build \
   $(if $(filter libclc-%, $(packages)),stamps/debian-libclc-build) \
-  $(if $(filter %-wasm32 %-wasm64, $(packages)),stamps/debian-wasm-build) \
+  #$(if $(filter %-wasm32 %-wasm64, $(packages)),stamps/debian-wasm-build) \
   stamps/sccache-stats
 
 override_dh_prep: stamps/build_doc